String function ( GitRepository arg0 ) { conflict ( arg0 , BRANCH_FOR_UNMERGED_CONFLICTS , "srini_string" ) ; GitExecutor . git ( "srini_string" + BRANCH_FOR_UNMERGED_CONFLICTS , true ) ; return GitExecutor . git ( "srini_string" + BRANCH_FOR_UNMERGED_CONFLICTS ) ; }
make an unmerged file in the repository . concode_field_sep String initial concode_elem_sep String branchLine concode_elem_sep MergeContent LOCAL_CHANGES_OVERWRITTEN_BY concode_elem_sep String masterLine concode_elem_sep String BRANCH_FOR_UNMERGED_CONFLICTS concode_field_sep void append1 concode_elem_sep boolean branchExists concode_elem_sep boolean branchExists concode_elem_sep void branchWithCommit concode_elem_sep void branchWithCommit concode_elem_sep void branchWithCommit concode_elem_sep void branchWithCommit concode_elem_sep void branchWithCommit concode_elem_sep void branchWithCommit concode_elem_sep void branchWithCommit concode_elem_sep void untrackedFileOverwrittenBy concode_elem_sep void checkoutOrCreate concode_elem_sep void checkoutOrCreate concode_elem_sep void prepend concode_elem_sep String commit concode_elem_sep String commit concode_elem_sep void localChangesOverwrittenByWithoutConflict concode_elem_sep void checkout concode_elem_sep String conflict concode_elem_sep String conflict