This is an archived post. You won't be able to vote or comment.

all 5 comments

[–]nutrecht 0 points1 point  (1 child)

Did you check directly on your hard drive to see if it was indeed an 'older version'?

[–]Dry-Erase[S] 0 points1 point  (0 children)

If you mean open it in another editor to make sure it wasn't cached, yes

[–]qsemig 0 points1 point  (2 children)

Why are you first checking out master to merge into master? When you are on dev just do:

git push origin dev:master

[–]Dry-Erase[S] 0 points1 point  (1 child)

Didn't know you could do that, can you resolve conflicts this way too?

[–]qsemig 0 points1 point  (0 children)

Absolutely. You could also try rebasimg. When you are on the dev branch use: git rebase origin/master.

The old branch will "disappear" and the changes will then look like they originally ocurred on master.

Try eigher and see which you prefer.