Skip to content
bahusoid edited this page Mar 8, 2017 · 18 revisions

#Settings

Setting store in "%AppData%\Visual Studio Auto Merge\automerge.conf" file. Use your favorite editor while.

Bold is default value

##last_operation

  • merge - last operation was only merge
  • merge_checkin - last operation was merge and then checkin

##merge_operation_default Default state of "Merge" button

  • last - set last merge operation (e.g. depend of last_operation value)
  • merge - always set only merge mode
  • merge_checkin - always set merge and then checkin mode

##comment_format Format of comment, which be save to changeset.

Predifined keywords:

  • {OriginalBranch}
  • {OriginalBranchFull}
  • {SourceBranch}
  • {SourceBranchFull}
  • {TargetBranch}
  • {TargetBranchFull}
  • {OriginalComment}
  • {SourceComment}
  • {FromOriginalToTarget}
  • {FromOriginalToTargetFull}
  • {SourceChangesetId}
  • {SourceWorkItemIds}
  • {SourceWorkItemTitles}

Another words substituted as is. Default: MERGE {FromOriginalToTarget} ({OriginalComment})

##comment_format_discard Format of comment, which be save to changeset when discard merge.

Prdifined keywords:

  • All from comment_format
  • {comment_format} - substitute format from comment_format setting

Another words substituted as is.

Default: DISCARD {comment_format}

##branch_delimeter Delimeter which be used in {FromOriginalToTarget} ->

##changeset_count_show How many recent changeset showing.

Default: 20

Clone this wiki locally