git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* Considering merge --dry-run to foresee conflicts ahead of time
@ 2021-02-17 17:21 Alireza
  2021-02-17 18:39 ` Konstantin Tokarev
  2021-02-19 22:26 ` brian m. carlson
  0 siblings, 2 replies; 4+ messages in thread
From: Alireza @ 2021-02-17 17:21 UTC (permalink / raw)
  To: git

I have a half baked alias for this and it proved to be extremely
useful even in this state.

```
check = "!f() { BRANCH=${1:-HEAD}; BASE=${2:-origin/master}; git
merge-tree $(git merge-base $BRANCH $BASE) $BRANCH $BASE | sed -n
\"/+<<<<<<< .our/,/+>>>>>>> .their/p\"; }; f"
```

Of course with large conflicts it gets less useful. Getting only file
names from the patch isn't straightforward either.

So my question is what are the downsides to introducing a `merge
--dry-run` option and what would it look like?

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-02-20  0:02 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-17 17:21 Considering merge --dry-run to foresee conflicts ahead of time Alireza
2021-02-17 18:39 ` Konstantin Tokarev
2021-02-19 22:26 ` brian m. carlson
2021-02-19 23:59   ` Elijah Newren

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).