Home/ Questions/Q 8005821
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-06-04T17:19:24+00:00

Until now, I used to do: ‘git pull origin master’ and if there was

  • 0

Until now, I used to do: ‘git pull origin master’ and if there was something to merge, I would get an error, then I could use ‘git mergetool’ (loads p4merge) to merge files.

Now it just writes Fast-forward and auto-merges my files:

 * branch            master     -> FETCH_HEAD
Updating 508eb2e..b93d761
Fast-forward
 protected/controllers/AlbumController.php      |   14 +-
 protected/controllers/AlbumController.php.orig |  103 +++
 etc.

The thing is, I haven’t done anything particular to allow automerging. Why did this happen and how can I disable it?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    You seem to be rather confused. “Fast-forward” means it didn’t merge. It means that you had no local commits, so it just forwarded your branch pointer to the tip of what you pulled.

    • 0