git – I ran into a merge conflict. How can I abort the merge? – Stack Overflow
Posted by jpluimers on 2018/12/18
I need this one day: [WayBack] git – I ran into a merge conflict. How can I abort the merge? – Stack Overflow
–jeroen
The Wiert Corner – irregular stream of stuff
Jeroen W. Pluimers on .NET, C#, Delphi, databases, and personal interests
Subscribe
Archives
- December 2025 (31)
- November 2025 (47)
- October 2025 (50)
- September 2025 (49)
- August 2025 (47)
- July 2025 (50)
- June 2025 (47)
- May 2025 (48)
- April 2025 (46)
- March 2025 (44)
- February 2025 (48)
- January 2025 (55)
- December 2024 (48)
- November 2024 (44)
- October 2024 (51)
- September 2024 (46)
- August 2024 (53)
- July 2024 (50)
- June 2024 (36)
- May 2024 (33)
- April 2024 (33)
- March 2024 (36)
- February 2024 (28)
- January 2024 (28)
- December 2023 (27)
- November 2023 (24)
- October 2023 (24)
- September 2023 (29)
- August 2023 (31)
- July 2023 (33)
- June 2023 (26)
- May 2023 (26)
- April 2023 (31)
- March 2023 (26)
- February 2023 (27)
- January 2023 (24)
- December 2022 (33)
- November 2022 (27)
- October 2022 (23)
- September 2022 (25)
- August 2022 (24)
- July 2022 (26)
- June 2022 (26)
- May 2022 (23)
- April 2022 (32)
- March 2022 (69)
- February 2022 (63)
- January 2022 (66)
- December 2021 (75)
- November 2021 (66)
- October 2021 (64)
- September 2021 (67)
- August 2021 (69)
- July 2021 (69)
- June 2021 (69)
- May 2021 (68)
- April 2021 (67)
- March 2021 (72)
- February 2021 (63)
- January 2021 (65)
- December 2020 (70)
- November 2020 (64)
- October 2020 (68)
- September 2020 (67)
- August 2020 (67)
- July 2020 (71)
- June 2020 (68)
- May 2020 (64)
- April 2020 (67)
- March 2020 (70)
- February 2020 (61)
- January 2020 (74)
- December 2019 (70)
- November 2019 (63)
- October 2019 (73)
- September 2019 (68)
- August 2019 (66)
- July 2019 (68)
- June 2019 (68)
- May 2019 (72)
- April 2019 (73)
- March 2019 (64)
- February 2019 (68)
- January 2019 (78)
- December 2018 (87)
- November 2018 (77)
- October 2018 (79)
- September 2018 (77)
- August 2018 (76)
- July 2018 (74)
- June 2018 (63)
- May 2018 (70)
- April 2018 (63)
- March 2018 (72)
- February 2018 (48)
- January 2018 (83)
- December 2017 (67)
- November 2017 (62)
- October 2017 (63)
- September 2017 (52)
- August 2017 (62)
- July 2017 (48)
- June 2017 (57)
- May 2017 (68)
- April 2017 (55)
- March 2017 (59)
- February 2017 (58)
- January 2017 (60)
- December 2016 (59)
- November 2016 (74)
- October 2016 (61)
- September 2016 (87)
- August 2016 (57)
- July 2016 (51)
- June 2016 (49)
- May 2016 (48)
- April 2016 (51)
- March 2016 (49)
- February 2016 (50)
- January 2016 (48)
- December 2015 (59)
- November 2015 (57)
- October 2015 (37)
- September 2015 (31)
- August 2015 (41)
- July 2015 (31)
- June 2015 (37)
- May 2015 (30)
- April 2015 (32)
- March 2015 (37)
- February 2015 (52)
- January 2015 (50)
- December 2014 (43)
- November 2014 (39)
- October 2014 (40)
- September 2014 (41)
- August 2014 (58)
- July 2014 (32)
- June 2014 (23)
- May 2014 (38)
- April 2014 (105)
- March 2014 (145)
- February 2014 (81)
- January 2014 (56)
- December 2013 (58)
- November 2013 (32)
- October 2013 (26)
- September 2013 (26)
- August 2013 (54)
- July 2013 (47)
- June 2013 (41)
- May 2013 (33)
- April 2013 (41)
- March 2013 (50)
- February 2013 (47)
- January 2013 (55)
- December 2012 (32)
- November 2012 (23)
- October 2012 (37)
- September 2012 (52)
- August 2012 (46)
- July 2012 (40)
- June 2012 (30)
- May 2012 (27)
- April 2012 (30)
- March 2012 (29)
- February 2012 (32)
- January 2012 (25)
- December 2011 (38)
- November 2011 (28)
- October 2011 (46)
- September 2011 (63)
- August 2011 (35)
- July 2011 (24)
- June 2011 (24)
- May 2011 (24)
- April 2011 (29)
- March 2011 (50)
- February 2011 (48)
- January 2011 (18)
- December 2010 (5)
- November 2010 (18)
- October 2010 (22)
- September 2010 (29)
- August 2010 (24)
- July 2010 (27)
- June 2010 (29)
- May 2010 (25)
- April 2010 (23)
- March 2010 (10)
- February 2010 (6)
- January 2010 (16)
- December 2009 (12)
- November 2009 (3)
- October 2009 (11)
- September 2009 (21)
- August 2009 (11)
- July 2009 (11)
- June 2009 (5)
- May 2009 (12)
- April 2009 (20)
-
*nix *nix-tools .NET About Apple C# Conferences Conference Topics Delphi Development Event Google Hardware History Internet LifeHacker Linux Mac Mac OS X / OS X / MacOS Personal Power User Scripting Security SocialMedia Software Development Source Code Management VMware Web Development Windows Windows 7
Recent Comments
Lars Fosdal on Security alarm provider Woonve… Thomas Mueller on Question got closed in May 202… Thaddy de Koning on Formulier voor bewindvoerders… Thaddy de Koning on Formulier voor bewindvoerders… Thaddy de Koning on Formulier voor bewindvoerders… -
Recent Posts
- If you develop web-sites, be sure their basics work without JavaScript, as JavaScript is a security risk
- Maarten van Smeden “This is why programming is an acquired skill” / Twitter
- Big Clive: Lighting tech tool bag tour 2025 – YouTube
- Visual Studio Code has had a PlantUML extension for a while now
- More invoices: WordPress, Google,
Blog Stats
- 3,605,082 hits
Meta title
Tag Cloud Title
.NET Framework 1 2 3 4 6 7 8 16 18 25 32 android Apple arts aviation batch file bitbucket blogging command-line computer Conferences Delphi delphi 1 delphi 5 design developer documentation education embarcadero flickr gadgets geeks gmail google google search include infosec internet iOS iphone jeroen mac os x Media microsoft surface mobile nick hodges pascal path names pdf photography Privacy Python RaspberryPi research science scott hanselman shorts software sourcecode language sourceforge ssd stack overflow technology TLS transportation Travel twitter vcl vm VMware VMware Fusion VMware Workstation wordpress xkcdTop Clicks
Top Posts
- When NTFS shrink fails, despite using the default settings from the shrink dialog
- Calls from +18553308653 might be because someone is trying to use your phone number to setup a Microsoft account two factor authentication
- Historic storage prices: graphs and tables
- C13/C14 wiring diagram live/neutral/earth
- Archives
- NeverSSL - helping you get online on WiFi networks requiring authentication
- Delphi multi-threading: confused by TThread.Synchronize / TThread.Queue? You're not alone. And you need to be aware of exceptions there too.
- Reddit - PSA: Fast way to complete the "Use 10 super effective charged attacks" field research : TheSilphRoad
- DELL fans use a different pin-layout than normal fans, so watch out before connecting them!
- html - What can cause Chrome to give an net::ERR_FAILED on cached content against a server on localhost? - Stack Overflow
My badges
Twitter Updates
Tweets by jpluimersMy Flickr Stream
Pages
All categories
-
Join 1,860 other subscribers
The Wiert Corner - irregular stream of stuff 
Leave a comment