Timeline for How to deal with merging of Visual Studio projects
Current License: CC BY-SA 3.0
12 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Mar 15, 2022 at 9:09 | answer | added | Andreas | timeline score: 0 | |
| Oct 11, 2019 at 8:57 | vote | accept | Tomáš Zato | ||
| Jul 25, 2018 at 16:04 | answer | added | RandomUs1r | timeline score: 0 | |
| Jul 25, 2018 at 15:13 | answer | added | Ewan | timeline score: 2 | |
| Jan 24, 2017 at 11:28 | comment | added | Tomáš Zato | @DocBrown No I don't. But I read the article and maybe enforcing conflicts on those files is what I need. I wonder if I could enforce behavior they describe on any file type I chose. | |
| Jan 24, 2017 at 9:56 | history | edited | Tomáš Zato | CC BY-SA 3.0 |
added 78 characters in body
|
| Jan 20, 2017 at 13:37 | history | tweeted | twitter.com/StackSoftEng/status/822437828961431552 | ||
| Jan 18, 2017 at 20:25 | comment | added | Doc Brown |
Found this article by a quick google search: haacked.com/archive/2014/04/16/csproj-merge-conflicts Do you have a configuration like *.csproj merge=union in your .gitattributes?
|
|
| Jan 18, 2017 at 20:18 | comment | added | Doc Brown | C++ project files are somewhat different from other .NET language files, in general more complex. | |
| Jan 18, 2017 at 19:51 | comment | added | Tomáš Zato | How does project language affect what does meerge tool to XML files? The problem is that certain changes are automatically resolve and not marked as conflict. | |
| Jan 18, 2017 at 19:17 | comment | added | Doc Brown | "in such ways that the merge tool does not even recognize conflict properly" - never encountered such a situation by myself Which programming languages and project types are you using mainly? | |
| Jan 18, 2017 at 16:17 | history | asked | Tomáš Zato | CC BY-SA 3.0 |