兩個分支合併時,略過某些檔案

朋友問到兩個分支合併時,不要合併如 web.config 一類的檔案,作法如以下的建議

http://stackoverflow.com/questions/9996136/exclude-a-config-file-from-the-merge-process

雖然第二個回應未被標成答案,但似乎反而比較簡單執行,雖然 merge 時會有錯誤訊息,但當作沒看到應該還好🙂

image

發表迴響

在下方填入你的資料或按右方圖示以社群網站登入:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / 變更 )

Twitter picture

You are commenting using your Twitter account. Log Out / 變更 )

Facebook照片

You are commenting using your Facebook account. Log Out / 變更 )

Google+ photo

You are commenting using your Google+ account. Log Out / 變更 )

連結到 %s

%d 位部落客按了讚: