My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 2570: Temporary files generated during merge conflict resolution are included in buck build
1 person starred this issue and may be notified of changes. Back to list
Status:  New
Owner:  ----


Sign in to add a comment
 
Project Member Reported by david.pu...@sonymobile.com, Mar 26, 2014
************************************************************
***** NOTE: THIS BUG TRACKER IS FOR GERRIT CODE REVIEW *****
***** DO NOT SUBMIT BUGS FOR CHROME, ANDROID, INTERNAL *****
***** ISSUES WITH YOUR COMPANY'S GERRIT SETUP, ETC.    *****
***** THOSE ISSUE BELONG IN DIFFERENT ISSUE TRACKERS!  *****
************************************************************

Affected Version: master

What steps will reproduce the problem?
1. merge from stable into master, introducing a merge conflict
2. resolve the merge conflicts with git mergetool
3. build with buck

What is the expected output? What do you see instead?

Temporary files generated during the conflict resolution are included in the buck build, which causes the build to fail.


Please provide any additional information below.

Sign in to add a comment

Powered by Google Project Hosting