I made this mess last week and discarded that branch and started new, I wish I came across this video before😊. I was thinking rebase should be avoided without knowing why, but your video makes lot of sense to me now
@99MrX99
Жыл бұрын
Great video! Would be great if you could show git pull with rebase too. I have git configured to use git pull rebase but my teammates don't. Is there a way to set this for all in a repository config?
@danclarkeuk
Жыл бұрын
Thanks. I don't think this is something that should be enforced to be honest. Especially not at a repository level. You wouldn't want it to behave one way in one repo, but another way in another repo - that would be super-confusing. The downside of having pull set to rebase, is that Git complains when you pull if you have pending changes. Git doesn't let you rebase with pending changes. I'd personally keep it as the default (merge), but just never use pull if you have local commits.
@99MrX99
Жыл бұрын
@@danclarkeuk Our team only works on one repository so that would not be a problem. And git pull with rebase does work whith incoming changes if auto merge or how it is called is configured, works fine for me
@danclarkeuk
Жыл бұрын
@@99MrX99 I still think that this setting should be an individual/personal decision. People have different preferences. And your workplace might only have one repo, but team members might use Git for side projects, etc.
@Benke01
10 ай бұрын
@@99MrX99 I think you might be thinking of authStash and its very convenient. You set your config to: git config --global pull.rebase true git config --global rebase.autoStash true
Пікірлер: 8