Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

I reverted some changes and now my master has different code and branch has reverted code

Deepank khurana
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
April 23, 2019

Both branch and master say up to date but both have different code.. there is no local changes to commit and when i try to merge master into branch then also it says up to date.

1 answer

0 votes
Sandesh Shetty
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
April 23, 2019

@Deepank khurana 

If you want to merge reverted commit to master, open pull request to merge code from your branch to master. But if you want to merge code from master to your branch, then it will show "up to date" because there is no additional commits in master to merge ( From master to your branch).

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events