ourworld_web/www_ourworld_tf
20
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 1 Wiki Activity

Can't merge changes from development branch into master #23

New Issue
Closed
opened 2024-04-24 10:42:04 +00:00 by samtaggart · 3 comments
samtaggart commented 2024-04-24 10:42:04 +00:00 (Migrated from github.com)
Copy Link

When I try to merge development into master, it takes me to a different repo altogether (timurgordon >>> ourworld_lp) and when I try to change that repo back to ourworldventures >>> www_ourworld_tf, I get an error.

Screenshot 2024-04-24 at 13 39 56 Screenshot 2024-04-24 at 13 40 15

I just want to merge the changes I made to the people page on development into the production site.

When I try to merge development into master, it takes me to a different repo altogether (timurgordon >>> ourworld_lp) and when I try to change that repo back to ourworldventures >>> www_ourworld_tf, I get an error. <img width="1461" alt="Screenshot 2024-04-24 at 13 39 56" src="https://github.com/ourworldventures/www_ourworld_tf/assets/50134479/b53f8450-f215-477d-b9a1-d6fd104b37e5"> <img width="1454" alt="Screenshot 2024-04-24 at 13 40 15" src="https://github.com/ourworldventures/www_ourworld_tf/assets/50134479/1a63dda6-1085-4129-93b7-efb01a212c23"> I just want to merge the changes I made to the people page on development into the production site.
samtaggart commented 2024-04-24 12:52:28 +00:00 (Migrated from github.com)
Copy Link

@ehab-hassan Can you check why there is a black mark over "Info" in the header

Screenshot 2024-04-24 at 15 18 03

@ehab-hassan Can you check why there is a black mark over "Info" in the header ![Screenshot 2024-04-24 at 15 18 03](https://github.com/ourworldventures/www_ourworld_tf/assets/50134479/7a131ef5-39d8-45a9-9bef-c036035603b0)
ehab-hassan commented 2024-04-24 13:39:11 +00:00 (Migrated from github.com)
Copy Link

fixed

fixed
samtaggart commented 2024-04-24 13:49:48 +00:00 (Migrated from github.com)
Copy Link

@ehab-hassan I made a few quick fixes (sorry) and still facing the issue (cannot merge development to main). Why is this happening?

@ehab-hassan I made a few quick fixes (sorry) and still facing the issue (cannot merge development to main). Why is this happening?
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels   
priority_critical

   
priority_major
  
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
question

More information is needed

No Label
priority_critical
priority_major
bug
duplicate
enhancement
question
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: ourworld_web/www_ourworld_tf#23
No description provided.
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?