Edward Welbourne wrote:
> $ git add stuff/parts/burble.txt
> $ git rm stuff/parts/frobnotz.txt
> stuff/parts/frobnotz.txt: needs merge
> rm 'stuff/parts/frobnotz.txt'
I agree that this is ugly. Please feel free to send a patch
eliminating both messages to g...@vger.kernel.org (cc-ing me), in cas
> Could you provide some sample output? Yes, I know I can do it
> myself, but I am lazy. :)
e...@pool:work$ git merge origin/topic-branch-blah
Renaming stuff/parts/foobar.txt => stuff/parts/burble.txt
Auto-merging stuff/parts/burble.txt
CONFLICT (rename/modify): Merge conflict in stuff/parts/bu
Hi,
Edward Welbourne wrote:
> git rm nags me
> about files that still need merged and reports which files it is
> removing.
[...]
> More irritatingly, git rm even nags about the files I've told it to
> remove, before telling me that it's removing them.
Could you provide some sample output? Yes,
Package: git
Version: 1:1.7.1-1.1
Severity: minor
Tags: upstream
When I've done a merge that got conflicts, I fix up the conflicts,
then git add and git rm files as appropriate; git add is silent (even
if there are further files in need of attention) but git rm nags me
about files that still need
4 matches
Mail list logo
