[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/s
From: |
Amin Bandali |
Subject: |
Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs |
Date: |
Tue, 18 Aug 2020 23:56:32 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) |
Basil L. Contovounesios writes:
[...]
>
> Am I the only one who prefers doing separate 'git fetch' and 'git
> merge/rebase' operations, and never uses 'git pull'? :)
>
> This way I get to see exactly what's changed upstream, whether it
> conflicts with my local changes, decide whether I want/need to
> merge/rebase, etc. etc.
Not much substance to add, but same here. I generally try to start at
the tip of the branch (i.e. its latest commit) I plan to commit to, in
order to avoid the need for rebasing or merging whenever possible. Once
I'm done writing, I fetch and review upstream changes if any, carefully
rebase my own commit(s) on top of them, and push. It's worked out very
well for my (admittedly mostly small-scoped) changes to various git
repositories thus far.
signature.asc
Description: PGP signature
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, (continued)
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Eli Zaretskii, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Lars Ingebrigtsen, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Eli Zaretskii, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Lars Ingebrigtsen, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Eli Zaretskii, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, David De La Harpe Golden, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Basil L. Contovounesios, 2020/08/18
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs,
Amin Bandali <=
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Stephen Leake, 2020/08/19
- Rebasing vs. merging, Teemu Likonen, 2020/08/19
- Re: Rebasing vs. merging, Kévin Le Gouguec, 2020/08/19
- Re: Rebasing vs. merging, Eli Zaretskii, 2020/08/19
- Re: Rebasing vs. merging, Paul Eggert, 2020/08/19
- Re: Rebasing vs. merging, John Wiegley, 2020/08/19
- Rebasing vs merging (was: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs), Óscar Fuentes, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Eli Zaretskii, 2020/08/17