<?xml version="1.0"?>
<News hasArchived="true" page="7750" pageCount="10928" pageSize="10" timestamp="Fri, 06 Nov 2026 02:19:47 -0500" url="https://my3.my.umbc.edu/posts.xml?page=7750">
<NewsItem contentIssues="true" id="43665" important="false" status="posted" url="https://my3.my.umbc.edu/posts/43665">
<Title>Designer Meng To&#8217;s Writing Adventure Stemmed from Denied Visa</Title>
<Body>
<![CDATA[
    <div class="html-content">
    <div>
    <a href="http://blog.teamtreehouse.com/wp-content/uploads/2014/04/Meng-To.jpg" rel="nofollow external" class="bo"><img alt="Meng To" src="http://blog.teamtreehouse.com/wp-content/uploads/2014/04/Meng-To.jpg" width="1000" height="756" style="max-width: 100%; height: auto;"></a><p>Meng To</p>
    </div>
    <p>In 2013, Meng To was enjoying the startup life in Silicon Valley while lending his web design talents to Heyzap, a mobile game developer.</p>
    <p>Until his request for a new visa was denied.</p>
    <p>The Cambodian-born web designer and developer from Montreal boasted 12 years of experience, but without a degree in higher education, he couldn’t obtain another visa to stay in the U.S. and work for startups sprouting in San Francisco and New York.</p>
    <p>So he decided to take his skills on the road, traveling the world and working at a startup in Asia. He eventually compiled everything he learned here and abroad in a new book called <a href="http://designcode.io" rel="nofollow external" class="bo">design + code</a>.</p>
    <p>To, now 31, wrote his book about designing and coding websites and iPhone apps in Seoul. The book delves into how to design for iOS, use software like Sketch and Xcode for design purposes, and build an app from scratch to a sale in Apple’s App Store. The book, written in three parts, will be available at the end of April for $100.</p>
    <p>“The purpose of this book is to definitely take the knowledge I gained and the feedback that I got and put that in a book,” To says. “The book is definitely born out of the feedback I got from people.”</p>
    <p><strong>Free trial on Treehouse:</strong> Do you want to learn better front-end design skills? <a href="https://teamtreehouse.com/subscribe/plans?cid=2062&amp;utm_source=story-23307-meng-to&amp;trial=yes" rel="nofollow external" class="bo">Click here to try a free 14-day trial on Treehouse</a>.</p>
    <h2>Building Experience and Reputation</h2>
    <p>By 2011, To says he felt confident creating simple and functional modern-day web design compared to design from 1998, the year he created a site to share drawings of people he admired, like actor Jet Li.</p>
    <p>More than a decade earlier, in 2000, To passed on college for a job at a design agency, where he started his career. And 11 years later, Dribbble — a social media network for designers — magnified his skills and experience. Designers interested in his work connected with him.</p>
    <p>By spring 2012, Dribbble opened the doors for To with a position at Heyzap, where he wrote in his blog about using Sketch for user-interface design as a replacement for Photoshop.</p>
    <p>“I changed their complete design flow,” he says. “I made them switch to Sketch. Everybody’s talking about Sketch. Every designer knows about Sketch. That was like a big stepping stone for me, just writing about Sketch.”</p>
    <p>He obtained a J-1 visa — which allowed him to work in the U.S. for 18 months — to work at Heyzap. But with his influence on the rise, To applied to stay in the U.S. longer with an H1B visa, which requires either a bachelor’s degree or 12 years of experience. To had the experience, but his visa application was still denied.</p>
    <div>
    <a href="http://blog.teamtreehouse.com/wp-content/uploads/2014/04/Meng-To-2.jpg" rel="nofollow external" class="bo"><img alt="Meng To" src="http://blog.teamtreehouse.com/wp-content/uploads/2014/04/Meng-To-2.jpg" width="1000" height="667" style="max-width: 100%; height: auto;"></a><p>Meng To at work.</p>
    </div>
    <h2>Time to Hit the Road</h2>
    <p>It was June 2013, and To didn’t want to return to Montreal, a city without an influential design community, so he decided to travel. He chose Asia to see the world he left at 8 years old, when his family immigrated to Canada from Cambodia.</p>
    <p>His first stop was Singapore, a country with an English-speaking startup community. After Singapore, he traveled to Bali, then Jakarta. While in Indonesia, he received an email from Christopher Yeung of <a href="http://carshare.hk/" rel="nofollow external" class="bo">Carshare.hk</a>, a Hong Kong service that allows people to rent out their personal vehicles to others nearby. Yeung paid for To’s airline ticket to Hong Kong last September, where To stayed for almost six months, helping Carshare launch its website and iPhone app as its sole designer.</p>
    <p>“I was working with extremely hardworking people,” he says. “They were working on weekends. We were hustling from morning to 8, 9 p.m. They were extremely young as well. It’s pretty rare to see a startup with young people, especially outside San Francisco.”</p>
    <p>The around-the-clock dedication rubbed off. He attended hackathons in his free time after meeting a back-end engineer and an iOS developer. His newfound knowledge on front-end, back-end and iOS design inspired him to write again. Instead of a blog, he believed a book describing how to create a website with an iPhone app from scratch would be more beneficial to those eager to learn.</p>
    <p>“What I noticed from writing is that I was influencing these people’s lives with changing the way they worked and inspiring them to build their own iPhone applications and to make the switch from Photoshop to Sketch,” he says. “Instead of freelancing, I’m just going to write a book.”</p>
    <p>After his Twitter followers voiced their support for the book, To received 600 pre-orders.</p>
    <p>He’s now in the ninth month of his international adventure, busily finishing up the book he started a little more than a month ago.</p>
    <p><em>Find information on To’s book at <a href="http://designcode.io" rel="nofollow external" class="bo">http://designcode.io</a>.</em></p>
    <p>The post <a href="http://blog.teamtreehouse.com/international-startup-experience-inspires-web-designer-release-book" rel="nofollow external" class="bo">Designer Meng To’s Writing Adventure Stemmed from Denied Visa</a> appeared first on <a href="http://blog.teamtreehouse.com" rel="nofollow external" class="bo">Treehouse Blog</a>.</p>
    </div>
]]>
</Body>
<Summary>Meng To    In 2013, Meng To was enjoying the startup life in Silicon Valley while lending his web design talents to Heyzap, a mobile game developer.   Until his request for a new visa was denied....</Summary>
<Website>http://feedproxy.google.com/~r/teamtreehouse/~3/MDOMaGY5hqQ/international-startup-experience-inspires-web-designer-release-book</Website>
<TrackingUrl>https://my3.my.umbc.edu/api/v0/pixel/news/43665/guest@my.umbc.edu/f0b08096bae8b26a1d474b6ce30c22ed/api/pixel</TrackingUrl>
<Tag>android</Tag>
<Tag>css</Tag>
<Tag>design</Tag>
<Tag>development</Tag>
<Tag>html</Tag>
<Tag>ios</Tag>
<Tag>javascript</Tag>
<Tag>responsive</Tag>
<Tag>uncategorized</Tag>
<Tag>web</Tag>
<Tag>web-industry</Tag>
<Group token="retired-583">Web Developer - Build Group</Group>
<GroupUrl>https://my3.my.umbc.edu/groups/retired-583</GroupUrl>
<AvatarUrl>https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/xsmall.png?1363101197</AvatarUrl>
<AvatarUrl size="original">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/original.jpg?1363101197</AvatarUrl>
<AvatarUrl size="xxlarge">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/xxlarge.png?1363101197</AvatarUrl>
<AvatarUrl size="xlarge">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/xlarge.png?1363101197</AvatarUrl>
<AvatarUrl size="large">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/large.png?1363101197</AvatarUrl>
<AvatarUrl size="medium">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/medium.png?1363101197</AvatarUrl>
<AvatarUrl size="small">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/small.png?1363101197</AvatarUrl>
<AvatarUrl size="xsmall">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/xsmall.png?1363101197</AvatarUrl>
<AvatarUrl size="xxsmall">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/xxsmall.png?1363101197</AvatarUrl>
<Sponsor>Web Developer - Build Group</Sponsor>
<PawCount>0</PawCount>
<CommentCount>0</CommentCount>
<CommentsAllowed>true</CommentsAllowed>
<PostedAt>Wed, 16 Apr 2014 11:08:37 -0400</PostedAt>
<EditAt>Wed, 16 Apr 2014 11:08:37 -0400</EditAt>
</NewsItem>

<NewsItem contentIssues="false" id="43663" important="false" status="posted" url="https://my3.my.umbc.edu/posts/43663">
<Title>#WebinarAlert: Do you want insider information to help your business achieve exp...</Title>
<Body>
<![CDATA[
    <div class="html-content">#WebinarAlert: Do you want insider information to help your business achieve exponential growth? Instructor Gib Mason can help! Join him TOMORROW for his #webinar from 12 to 1 PM EST! Don't let this life-enriching opportunity pass you by! You can register here: <a href="http://l.facebook.com/l.php?u=http%3A%2F%2Fwww.umbctraining.com%2FAbout-Us%2FEvents%2FWebinar-Disruptive-Interventions&amp;h=HAQEuNQTl&amp;s=1" rel="nofollow external" class="bo">http://www.umbctraining.com/About-Us/Events/Webinar-Disruptive-Interventions</a> <br><br><br><a href="http://l.facebook.com/l.php?u=http%3A%2F%2Fwww.umbctraining.com%2FAbout-Us%2FEvents%2FWebinar-Disruptive-Interventions&amp;h=wAQH1o9It&amp;s=1" rel="nofollow external" class="bo">Webinar - Disruptive Interventions</a><br><a href="http://www.umbctraining.com">www.umbctraining.com</a><br>Join us April 17th to learn how to achieve significant growth in your organization!</div>
]]>
</Body>
<Summary>#WebinarAlert: Do you want insider information to help your business achieve exponential growth? Instructor Gib Mason can help! Join him TOMORROW for his #webinar from 12 to 1 PM EST! Don't let...</Summary>
<Website>http://www.facebook.com/umbctraining/posts/10151963750231076</Website>
<TrackingUrl>https://my3.my.umbc.edu/api/v0/pixel/news/43663/guest@my.umbc.edu/03ed678f94db93d54fe421df533d3b08/api/pixel</TrackingUrl>
<Tag>ccna</Tag>
<Tag>ceh</Tag>
<Tag>centers</Tag>
<Tag>cisco</Tag>
<Tag>cyber</Tag>
<Tag>cybersecurity</Tag>
<Tag>information</Tag>
<Tag>it</Tag>
<Tag>leadership</Tag>
<Tag>management</Tag>
<Tag>microsoft</Tag>
<Tag>project</Tag>
<Tag>security</Tag>
<Tag>technology</Tag>
<Tag>training</Tag>
<Tag>umbc</Tag>
<Group token="retired-575">UMBC Training Centers</Group>
<GroupUrl>https://my3.my.umbc.edu/groups/retired-575</GroupUrl>
<AvatarUrl>https://assets1-my.umbc.edu/system/shared/avatars/groups/000/000/575/83756b985266168d0d29c6c9a146db50/xsmall.png?1361981335</AvatarUrl>
<AvatarUrl size="original">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/575/83756b985266168d0d29c6c9a146db50/original.jpg?1361981335</AvatarUrl>
<AvatarUrl size="xxlarge">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/575/83756b985266168d0d29c6c9a146db50/xxlarge.png?1361981335</AvatarUrl>
<AvatarUrl size="xlarge">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/575/83756b985266168d0d29c6c9a146db50/xlarge.png?1361981335</AvatarUrl>
<AvatarUrl size="large">https://assets1-my.umbc.edu/system/shared/avatars/groups/000/000/575/83756b985266168d0d29c6c9a146db50/large.png?1361981335</AvatarUrl>
<AvatarUrl size="medium">https://assets2-my.umbc.edu/system/shared/avatars/groups/000/000/575/83756b985266168d0d29c6c9a146db50/medium.png?1361981335</AvatarUrl>
<AvatarUrl size="small">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/575/83756b985266168d0d29c6c9a146db50/small.png?1361981335</AvatarUrl>
<AvatarUrl size="xsmall">https://assets1-my.umbc.edu/system/shared/avatars/groups/000/000/575/83756b985266168d0d29c6c9a146db50/xsmall.png?1361981335</AvatarUrl>
<AvatarUrl size="xxsmall">https://assets2-my.umbc.edu/system/shared/avatars/groups/000/000/575/83756b985266168d0d29c6c9a146db50/xxsmall.png?1361981335</AvatarUrl>
<Sponsor>UMBC Training Centers</Sponsor>
<PawCount>0</PawCount>
<CommentCount>0</CommentCount>
<CommentsAllowed>true</CommentsAllowed>
<PostedAt>Wed, 16 Apr 2014 10:40:32 -0400</PostedAt>
<EditAt>Wed, 16 Apr 2014 10:40:32 -0400</EditAt>
</NewsItem>

<NewsItem contentIssues="false" id="106824" important="false" status="posted" url="https://my3.my.umbc.edu/posts/106824">
<Title>Career Q&amp;A: Ting Zhang '03, M.A., intercultural communications, professor</Title>
<Body>
<![CDATA[
    <div class="html-content">Every so often, we’ll chat with an alum about what they do and how they got there. Today we’re talking …</div>
]]>
</Body>
<Summary>Every so often, we’ll chat with an alum about what they do and how they got there. Today we’re talking …</Summary>
<Website>https://magazine.umbc.edu/career-qa-ting-zhang-03-m-a-intercultural-communications-professor-2/</Website>
<TrackingUrl>https://my3.my.umbc.edu/api/v0/pixel/news/106824/guest@my.umbc.edu/a3ebf7d414da29b6248252d2318d7506/api/pixel</TrackingUrl>
<Tag>aging</Tag>
<Tag>alumni</Tag>
<Tag>career-q-and-a</Tag>
<Tag>dr-ting-zhang</Tag>
<Tag>economics</Tag>
<Tag>entrepreneurship</Tag>
<Tag>intercultural-communications</Tag>
<Tag>stories</Tag>
<Tag>umbc</Tag>
<Tag>university-of-maryland-baltimore-county</Tag>
<Group token="retired-1945">UMBC Magazine</Group>
<GroupUrl>https://my3.my.umbc.edu/groups/retired-1945</GroupUrl>
<AvatarUrl>https://assets2-my.umbc.edu/images/avatars/group/8/xsmall.png?1793799445</AvatarUrl>
<AvatarUrl size="original">https://assets2-my.umbc.edu/images/avatars/group/8/original.png?1793799445</AvatarUrl>
<AvatarUrl size="xxlarge">https://assets3-my.umbc.edu/images/avatars/group/8/xxlarge.png?1793799445</AvatarUrl>
<AvatarUrl size="xlarge">https://assets3-my.umbc.edu/images/avatars/group/8/xlarge.png?1793799445</AvatarUrl>
<AvatarUrl size="large">https://assets3-my.umbc.edu/images/avatars/group/8/large.png?1793799445</AvatarUrl>
<AvatarUrl size="medium">https://assets1-my.umbc.edu/images/avatars/group/8/medium.png?1793799445</AvatarUrl>
<AvatarUrl size="small">https://assets4-my.umbc.edu/images/avatars/group/8/small.png?1793799445</AvatarUrl>
<AvatarUrl size="xsmall">https://assets2-my.umbc.edu/images/avatars/group/8/xsmall.png?1793799445</AvatarUrl>
<AvatarUrl size="xxsmall">https://assets2-my.umbc.edu/images/avatars/group/8/xxsmall.png?1793799445</AvatarUrl>
<Sponsor>UMBC Magazine</Sponsor>
<PawCount>0</PawCount>
<CommentCount>0</CommentCount>
<CommentsAllowed>false</CommentsAllowed>
<PostedAt>Wed, 16 Apr 2014 10:30:56 -0400</PostedAt>
</NewsItem>

<NewsItem contentIssues="false" id="106825" important="false" status="posted" url="https://my3.my.umbc.edu/posts/106825">
<Title>Career Q&amp;A: Ting Zhang &#8217;03, M.A., intercultural communications, professor</Title>
<Body>
<![CDATA[
    <div class="html-content">Every so often, we’ll chat with an alum about what they do and how they got there. Today we’re talking …</div>
]]>
</Body>
<Summary>Every so often, we’ll chat with an alum about what they do and how they got there. Today we’re talking …</Summary>
<Website>https://magazine.umbc.edu/career-qa-ting-zhang-03-m-a-intercultural-communications-professor/</Website>
<TrackingUrl>https://my3.my.umbc.edu/api/v0/pixel/news/106825/guest@my.umbc.edu/fa4a415d2d8681c6c8fd571e710bbe45/api/pixel</TrackingUrl>
<Tag>aging</Tag>
<Tag>alumni</Tag>
<Tag>career-q-and-a</Tag>
<Tag>dr-ting-zhang</Tag>
<Tag>economics</Tag>
<Tag>entrepreneurship</Tag>
<Tag>intercultural-communications</Tag>
<Tag>stories</Tag>
<Tag>umbc</Tag>
<Tag>university-of-maryland-baltimore-county</Tag>
<Group token="retired-1945">UMBC Magazine</Group>
<GroupUrl>https://my3.my.umbc.edu/groups/retired-1945</GroupUrl>
<AvatarUrl>https://assets2-my.umbc.edu/images/avatars/group/8/xsmall.png?1793799445</AvatarUrl>
<AvatarUrl size="original">https://assets2-my.umbc.edu/images/avatars/group/8/original.png?1793799445</AvatarUrl>
<AvatarUrl size="xxlarge">https://assets3-my.umbc.edu/images/avatars/group/8/xxlarge.png?1793799445</AvatarUrl>
<AvatarUrl size="xlarge">https://assets3-my.umbc.edu/images/avatars/group/8/xlarge.png?1793799445</AvatarUrl>
<AvatarUrl size="large">https://assets3-my.umbc.edu/images/avatars/group/8/large.png?1793799445</AvatarUrl>
<AvatarUrl size="medium">https://assets1-my.umbc.edu/images/avatars/group/8/medium.png?1793799445</AvatarUrl>
<AvatarUrl size="small">https://assets4-my.umbc.edu/images/avatars/group/8/small.png?1793799445</AvatarUrl>
<AvatarUrl size="xsmall">https://assets2-my.umbc.edu/images/avatars/group/8/xsmall.png?1793799445</AvatarUrl>
<AvatarUrl size="xxsmall">https://assets2-my.umbc.edu/images/avatars/group/8/xxsmall.png?1793799445</AvatarUrl>
<Sponsor>UMBC Magazine</Sponsor>
<PawCount>0</PawCount>
<CommentCount>0</CommentCount>
<CommentsAllowed>false</CommentsAllowed>
<PostedAt>Wed, 16 Apr 2014 10:30:56 -0400</PostedAt>
</NewsItem>

<NewsItem contentIssues="true" id="43667" important="false" status="posted" url="https://my3.my.umbc.edu/posts/43667">
<Title>Career Q&amp;A: Ting Zhang &#8217;03, M.A., intercultural communications, professor</Title>
<Body>
<![CDATA[
    <div class="html-content">Every so often, we’ll chat with an alum about what they do and how they got there. Today we’re talking with Dr. Ting Zhang ’03, M.A., intercultural communications, about her career as an assistant professor at the University of Baltimore … <a href="http://umbcalumni.wordpress.com/2014/04/16/career-qa-ting-zhang-03-m-a-intercultural-communications-professor/" rel="nofollow external" class="bo">Continue reading <span>→</span></a>
    </div>
]]>
</Body>
<Summary>Every so often, we’ll chat with an alum about what they do and how they got there. Today we’re talking with Dr. Ting Zhang ’03, M.A., intercultural communications, about her career as an assistant...</Summary>
<Website>http://umbcalumni.wordpress.com/2014/04/16/career-qa-ting-zhang-03-m-a-intercultural-communications-professor/</Website>
<TrackingUrl>https://my3.my.umbc.edu/api/v0/pixel/news/43667/guest@my.umbc.edu/d5a4d5dea8b4c8933cb009961b3225ff/api/pixel</TrackingUrl>
<Tag>00s-alums</Tag>
<Tag>aging</Tag>
<Tag>alumni</Tag>
<Tag>arts-and-humanities</Tag>
<Tag>career-q-and-a</Tag>
<Tag>dr-ting-zhang</Tag>
<Tag>economics</Tag>
<Tag>entrepreneurship</Tag>
<Tag>intercultural-communications</Tag>
<Tag>umbc</Tag>
<Tag>university-of-maryland-baltimore-county</Tag>
<Group token="retired-20">UMBC Alumni</Group>
<GroupUrl>https://my3.my.umbc.edu/groups/retired-20</GroupUrl>
<AvatarUrl>https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/020/08fe2621d8e716b02ec0da35256a998d/xsmall.png?1280681147</AvatarUrl>
<AvatarUrl size="original">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/020/08fe2621d8e716b02ec0da35256a998d/original.png?1280681147</AvatarUrl>
<AvatarUrl size="xxlarge">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/020/08fe2621d8e716b02ec0da35256a998d/xxlarge.png?1280681147</AvatarUrl>
<AvatarUrl size="xlarge">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/020/08fe2621d8e716b02ec0da35256a998d/xlarge.png?1280681147</AvatarUrl>
<AvatarUrl size="large">https://assets1-my.umbc.edu/system/shared/avatars/groups/000/000/020/08fe2621d8e716b02ec0da35256a998d/large.png?1280681147</AvatarUrl>
<AvatarUrl size="medium">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/020/08fe2621d8e716b02ec0da35256a998d/medium.png?1280681147</AvatarUrl>
<AvatarUrl size="small">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/020/08fe2621d8e716b02ec0da35256a998d/small.png?1280681147</AvatarUrl>
<AvatarUrl size="xsmall">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/020/08fe2621d8e716b02ec0da35256a998d/xsmall.png?1280681147</AvatarUrl>
<AvatarUrl size="xxsmall">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/020/08fe2621d8e716b02ec0da35256a998d/xxsmall.png?1280681147</AvatarUrl>
<Sponsor>UMBC Alumni</Sponsor>
<PawCount>0</PawCount>
<CommentCount>0</CommentCount>
<CommentsAllowed>false</CommentsAllowed>
<PostedAt>Wed, 16 Apr 2014 10:30:56 -0400</PostedAt>
<EditAt>Wed, 16 Apr 2014 10:30:56 -0400</EditAt>
</NewsItem>

<NewsItem contentIssues="true" id="43894" important="false" status="posted" url="https://my3.my.umbc.edu/posts/43894">
<Title>GetDesire - an endless hope</Title>
<Body>
<![CDATA[
    <div class="html-content"><p>This is Gallery image<img src="http://www.htmlgoodies.com/uploadedfiles/gallery/gallery-1397655693.jpg" style="max-width: 100%; height: auto;"></p></div>
]]>
</Body>
<Summary>This is Gallery image</Summary>
<Website>http://www.htmlgoodies.com/HTML5/gallery/getdesire-an-endless-hope-140416064508.html</Website>
<TrackingUrl>https://my3.my.umbc.edu/api/v0/pixel/news/43894/guest@my.umbc.edu/2d8f61a7f14e2b599e2c2a6c7e3acd15/api/pixel</TrackingUrl>
<Tag>html</Tag>
<Tag>htmlgoodies</Tag>
<Tag>learning</Tag>
<Group token="retired-583">Web Developer - Build Group</Group>
<GroupUrl>https://my3.my.umbc.edu/groups/retired-583</GroupUrl>
<AvatarUrl>https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/xsmall.png?1363101197</AvatarUrl>
<AvatarUrl size="original">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/original.jpg?1363101197</AvatarUrl>
<AvatarUrl size="xxlarge">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/xxlarge.png?1363101197</AvatarUrl>
<AvatarUrl size="xlarge">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/xlarge.png?1363101197</AvatarUrl>
<AvatarUrl size="large">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/large.png?1363101197</AvatarUrl>
<AvatarUrl size="medium">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/medium.png?1363101197</AvatarUrl>
<AvatarUrl size="small">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/small.png?1363101197</AvatarUrl>
<AvatarUrl size="xsmall">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/xsmall.png?1363101197</AvatarUrl>
<AvatarUrl size="xxsmall">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/xxsmall.png?1363101197</AvatarUrl>
<Sponsor>Web Developer - Build Group</Sponsor>
<PawCount>0</PawCount>
<CommentCount>0</CommentCount>
<CommentsAllowed>true</CommentsAllowed>
<PostedAt>Wed, 16 Apr 2014 09:41:34 -0400</PostedAt>
</NewsItem>

<NewsItem contentIssues="true" id="43659" important="false" status="posted" url="https://my3.my.umbc.edu/posts/43659">
<Title>Retriever Robotics: Hexacopter Demonstration</Title>
<Tagline>Learning about robotics and environmental applications</Tagline>
<Body>
<![CDATA[
    <div class="html-content">During our last GBM, Retriever Robotics (RR) was given a presentation on hexacopters.  In particular, our member Stephen explained about his environmental application of the copter as a member of the research group Ecosynth.  <div><br></div>
    <div>A special thanks to Stephen for the presentation and another thanks to Ecosynth for letting us borrow their copter!  Keep up the awesome research!</div>
    </div>
]]>
</Body>
<Summary>During our last GBM, Retriever Robotics (RR) was given a presentation on hexacopters.  In particular, our member Stephen explained about his environmental application of the copter as a member of...</Summary>
<TrackingUrl>https://my3.my.umbc.edu/api/v0/pixel/news/43659/guest@my.umbc.edu/857b6793e63af3a19aec8e200b56456f/api/pixel</TrackingUrl>
<Tag>copter</Tag>
<Tag>ecosynth</Tag>
<Tag>fly</Tag>
<Tag>hexacopter</Tag>
<Tag>retriever</Tag>
<Tag>robotics</Tag>
<Tag>rr</Tag>
<Group token="retrieverrobotics">Retriever Robotics</Group>
<GroupUrl>https://my3.my.umbc.edu/groups/retrieverrobotics</GroupUrl>
<AvatarUrl>https://assets2-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/xsmall.png?1722476600</AvatarUrl>
<AvatarUrl size="original">https://assets1-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/original.png?1722476600</AvatarUrl>
<AvatarUrl size="xxlarge">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/xxlarge.png?1722476600</AvatarUrl>
<AvatarUrl size="xlarge">https://assets1-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/xlarge.png?1722476600</AvatarUrl>
<AvatarUrl size="large">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/large.png?1722476600</AvatarUrl>
<AvatarUrl size="medium">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/medium.png?1722476600</AvatarUrl>
<AvatarUrl size="small">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/small.png?1722476600</AvatarUrl>
<AvatarUrl size="xsmall">https://assets2-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/xsmall.png?1722476600</AvatarUrl>
<AvatarUrl size="xxsmall">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/xxsmall.png?1722476600</AvatarUrl>
<Sponsor>Retriever Robotics</Sponsor>
<ThumbnailUrl size="xxlarge">https://assets3-my.umbc.edu/system/shared/thumbnails/news/000/043/659/c9128edb59deabafcc4886baef849ee1/xxlarge.jpg?1397653455</ThumbnailUrl>
<ThumbnailUrl size="xlarge">https://assets4-my.umbc.edu/system/shared/thumbnails/news/000/043/659/c9128edb59deabafcc4886baef849ee1/xlarge.jpg?1397653455</ThumbnailUrl>
<ThumbnailUrl size="large">https://assets1-my.umbc.edu/system/shared/thumbnails/news/000/043/659/c9128edb59deabafcc4886baef849ee1/large.jpg?1397653455</ThumbnailUrl>
<ThumbnailUrl size="medium">https://assets3-my.umbc.edu/system/shared/thumbnails/news/000/043/659/c9128edb59deabafcc4886baef849ee1/medium.jpg?1397653455</ThumbnailUrl>
<ThumbnailUrl size="small">https://assets3-my.umbc.edu/system/shared/thumbnails/news/000/043/659/c9128edb59deabafcc4886baef849ee1/small.jpg?1397653455</ThumbnailUrl>
<ThumbnailUrl size="xsmall">https://assets1-my.umbc.edu/system/shared/thumbnails/news/000/043/659/c9128edb59deabafcc4886baef849ee1/xsmall.jpg?1397653455</ThumbnailUrl>
<ThumbnailUrl size="xxsmall">https://assets2-my.umbc.edu/system/shared/thumbnails/news/000/043/659/c9128edb59deabafcc4886baef849ee1/xxsmall.jpg?1397653455</ThumbnailUrl>
<PawCount>0</PawCount>
<CommentCount>0</CommentCount>
<CommentsAllowed>true</CommentsAllowed>
<PostedAt>Wed, 16 Apr 2014 09:09:50 -0400</PostedAt>
</NewsItem>

<NewsItem contentIssues="true" id="43657" important="false" status="posted" url="https://my3.my.umbc.edu/posts/43657">
<Title>Retriever Robotics: At the FRC Competition!</Title>
<Tagline>Never forget where you came from</Tagline>
<Body>
<![CDATA[
    <div class="html-content">Retriever Robotics (RR) teamed up with Alpha Sigma Kappa - Women in Technical Studies to attend the FRC competition as spectators.  FRC stands for FIRST Robotics Competition and is a robotics competition for high school students.  During high school, many RR members were members of FRC teams.  Some of those teams include Team 007 (pronounced "Double 'O Seven", like James Bond) and REX.  <div><br></div>
    <div>Great job to all of the FRC teams!  </div>
    </div>
]]>
</Body>
<Summary>Retriever Robotics (RR) teamed up with Alpha Sigma Kappa - Women in Technical Studies to attend the FRC competition as spectators.  FRC stands for FIRST Robotics Competition and is a robotics...</Summary>
<TrackingUrl>https://my3.my.umbc.edu/api/v0/pixel/news/43657/guest@my.umbc.edu/1c676e5fb423a3300af6c6d928c1fa34/api/pixel</TrackingUrl>
<Tag>alpha</Tag>
<Tag>competition</Tag>
<Tag>frc</Tag>
<Tag>in</Tag>
<Tag>kappa</Tag>
<Tag>retriever</Tag>
<Tag>robot</Tag>
<Tag>robotics</Tag>
<Tag>rr</Tag>
<Tag>sigma</Tag>
<Tag>social</Tag>
<Tag>studies</Tag>
<Tag>technical</Tag>
<Tag>women</Tag>
<Group token="retrieverrobotics">Retriever Robotics</Group>
<GroupUrl>https://my3.my.umbc.edu/groups/retrieverrobotics</GroupUrl>
<AvatarUrl>https://assets2-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/xsmall.png?1722476600</AvatarUrl>
<AvatarUrl size="original">https://assets1-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/original.png?1722476600</AvatarUrl>
<AvatarUrl size="xxlarge">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/xxlarge.png?1722476600</AvatarUrl>
<AvatarUrl size="xlarge">https://assets1-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/xlarge.png?1722476600</AvatarUrl>
<AvatarUrl size="large">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/large.png?1722476600</AvatarUrl>
<AvatarUrl size="medium">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/medium.png?1722476600</AvatarUrl>
<AvatarUrl size="small">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/small.png?1722476600</AvatarUrl>
<AvatarUrl size="xsmall">https://assets2-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/xsmall.png?1722476600</AvatarUrl>
<AvatarUrl size="xxsmall">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/799/aca5d0940096c29f103a994dec2773ec/xxsmall.png?1722476600</AvatarUrl>
<Sponsor>Retriever Robotics</Sponsor>
<ThumbnailUrl size="xxlarge">https://assets2-my.umbc.edu/system/shared/thumbnails/news/000/043/657/14d1fed69baf86c2a545c990bbfefcf8/xxlarge.jpg?1397653106</ThumbnailUrl>
<ThumbnailUrl size="xlarge">https://assets1-my.umbc.edu/system/shared/thumbnails/news/000/043/657/14d1fed69baf86c2a545c990bbfefcf8/xlarge.jpg?1397653106</ThumbnailUrl>
<ThumbnailUrl size="large">https://assets4-my.umbc.edu/system/shared/thumbnails/news/000/043/657/14d1fed69baf86c2a545c990bbfefcf8/large.jpg?1397653106</ThumbnailUrl>
<ThumbnailUrl size="medium">https://assets3-my.umbc.edu/system/shared/thumbnails/news/000/043/657/14d1fed69baf86c2a545c990bbfefcf8/medium.jpg?1397653106</ThumbnailUrl>
<ThumbnailUrl size="small">https://assets3-my.umbc.edu/system/shared/thumbnails/news/000/043/657/14d1fed69baf86c2a545c990bbfefcf8/small.jpg?1397653106</ThumbnailUrl>
<ThumbnailUrl size="xsmall">https://assets2-my.umbc.edu/system/shared/thumbnails/news/000/043/657/14d1fed69baf86c2a545c990bbfefcf8/xsmall.jpg?1397653106</ThumbnailUrl>
<ThumbnailUrl size="xxsmall">https://assets3-my.umbc.edu/system/shared/thumbnails/news/000/043/657/14d1fed69baf86c2a545c990bbfefcf8/xxsmall.jpg?1397653106</ThumbnailUrl>
<PawCount>0</PawCount>
<CommentCount>0</CommentCount>
<CommentsAllowed>true</CommentsAllowed>
<PostedAt>Wed, 16 Apr 2014 09:03:48 -0400</PostedAt>
</NewsItem>

<NewsItem contentIssues="true" id="43126" important="false" status="posted" url="https://my3.my.umbc.edu/posts/43126">
<Title>Library Staff Highlight: Kathleen Bruce</Title>
<Body>
<![CDATA[
    <div class="html-content">
    <br><h6>
    <strong>Name: </strong>Kathleen Bruce</h6>
    <h6>
    <strong>Hometown: </strong>Annapolis, MD, USA</h6>
    <h6>
    <strong>Alma Mater: </strong>UMBC</h6>
    <br><strong>1. Where do you work in the library and how long have you worked there?</strong> <br>Circulation department. 2 years as a student assistant, and since April 2012 as a staff member.<br><br><strong>2. What would you like the campus community to know about your job? </strong><br>I take care of the course reserves for the campus. If it’s on reserve, it has passed through my hands. I handle copyright processing on these items as well. <br><br><strong>3. What’s your favorite aspect of working at UMBC? </strong><br>The campus is so familiar to me. Between attending as an undergrad and working here as staff, I’ve gotten to know the community very well. I can honestly say that it is a pleasure to be a part of it all and that I am proud of what we accomplish. <br><br><strong>4. Do you have a favorite project, event, or memory from your time working in the library?</strong><br>The addition of the RLC was a lot of fun for me because I love to see the campus changing. In addition to providing students with a much needed 24-hour study space, it allowed the rest of the library to rethink our layout and service points. <br><br><strong>5. If you were a UMBC student, what library services would you use/appreciate the most? </strong><br>The online database access is extremely valuable. In my first undergrad, I relied on these systems to get me through my late night procrastination projects. Not that I recommend this behavior, of course. <br><br><strong>6. If you had to survive on a desert island with only one book, movie, or TV show, what would it be and why?</strong><br>BBC’s Sherlock. Every time I watch it, I see something new. Also, Benedict Cumberbatch and Martin Freeman. <br><br><strong>7. A wizard has turned you into your favorite animal. What are you?</strong><br>A polar bear. Appears cute and cuddly, but is not messing around. <br><br>
    </div>
]]>
</Body>
<Summary>Name: Kathleen Bruce  Hometown: Annapolis, MD, USA  Alma Mater: UMBC  1. Where do you work in the library and how long have you worked there?  Circulation department. 2 years as a student...</Summary>
<TrackingUrl>https://my3.my.umbc.edu/api/v0/pixel/news/43126/guest@my.umbc.edu/ade3133e7be5a61e36df17f76ba6e41b/api/pixel</TrackingUrl>
<Tag>active</Tag>
<Tag>library-staff-highlights</Tag>
<Group token="library">Albin O. Kuhn Library &amp;amp; Gallery</Group>
<GroupUrl>https://my3.my.umbc.edu/groups/library</GroupUrl>
<AvatarUrl>https://assets1-my.umbc.edu/system/shared/avatars/groups/000/000/016/854d6fae5ee42911677c739ee1734486/xsmall.png?1279120404</AvatarUrl>
<AvatarUrl size="original">https://assets2-my.umbc.edu/system/shared/avatars/groups/000/000/016/854d6fae5ee42911677c739ee1734486/original.png?1279120404</AvatarUrl>
<AvatarUrl size="xxlarge">https://assets2-my.umbc.edu/system/shared/avatars/groups/000/000/016/854d6fae5ee42911677c739ee1734486/xxlarge.png?1279120404</AvatarUrl>
<AvatarUrl size="xlarge">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/016/854d6fae5ee42911677c739ee1734486/xlarge.png?1279120404</AvatarUrl>
<AvatarUrl size="large">https://assets2-my.umbc.edu/system/shared/avatars/groups/000/000/016/854d6fae5ee42911677c739ee1734486/large.png?1279120404</AvatarUrl>
<AvatarUrl size="medium">https://assets1-my.umbc.edu/system/shared/avatars/groups/000/000/016/854d6fae5ee42911677c739ee1734486/medium.png?1279120404</AvatarUrl>
<AvatarUrl size="small">https://assets2-my.umbc.edu/system/shared/avatars/groups/000/000/016/854d6fae5ee42911677c739ee1734486/small.png?1279120404</AvatarUrl>
<AvatarUrl size="xsmall">https://assets1-my.umbc.edu/system/shared/avatars/groups/000/000/016/854d6fae5ee42911677c739ee1734486/xsmall.png?1279120404</AvatarUrl>
<AvatarUrl size="xxsmall">https://assets1-my.umbc.edu/system/shared/avatars/groups/000/000/016/854d6fae5ee42911677c739ee1734486/xxsmall.png?1279120404</AvatarUrl>
<Sponsor>Albin O. Kuhn Library &amp; Gallery</Sponsor>
<ThumbnailUrl size="xxlarge">https://assets3-my.umbc.edu/system/shared/thumbnails/news/000/043/126/1eaceb6978b52baa6d14ca600f5349ea/xxlarge.jpg?1397652549</ThumbnailUrl>
<ThumbnailUrl size="xlarge">https://assets2-my.umbc.edu/system/shared/thumbnails/news/000/043/126/1eaceb6978b52baa6d14ca600f5349ea/xlarge.jpg?1397652549</ThumbnailUrl>
<ThumbnailUrl size="large">https://assets4-my.umbc.edu/system/shared/thumbnails/news/000/043/126/1eaceb6978b52baa6d14ca600f5349ea/large.jpg?1397652549</ThumbnailUrl>
<ThumbnailUrl size="medium">https://assets4-my.umbc.edu/system/shared/thumbnails/news/000/043/126/1eaceb6978b52baa6d14ca600f5349ea/medium.jpg?1397652549</ThumbnailUrl>
<ThumbnailUrl size="small">https://assets4-my.umbc.edu/system/shared/thumbnails/news/000/043/126/1eaceb6978b52baa6d14ca600f5349ea/small.jpg?1397652549</ThumbnailUrl>
<ThumbnailUrl size="xsmall">https://assets4-my.umbc.edu/system/shared/thumbnails/news/000/043/126/1eaceb6978b52baa6d14ca600f5349ea/xsmall.jpg?1397652549</ThumbnailUrl>
<ThumbnailUrl size="xxsmall">https://assets4-my.umbc.edu/system/shared/thumbnails/news/000/043/126/1eaceb6978b52baa6d14ca600f5349ea/xxsmall.jpg?1397652549</ThumbnailUrl>
<PawCount>29</PawCount>
<CommentCount>0</CommentCount>
<CommentsAllowed>true</CommentsAllowed>
<PostedAt>Wed, 16 Apr 2014 08:49:46 -0400</PostedAt>
<EditAt>Thu, 17 Apr 2014 09:39:08 -0400</EditAt>
</NewsItem>

<NewsItem contentIssues="true" id="43655" important="false" status="posted" url="https://my3.my.umbc.edu/posts/43655">
<Title>How to Deal with Merge Conflicts in Git</Title>
<Body>
<![CDATA[
    <div class="html-content">
    <p><em>The following is a guest post by by Tobias Günther. Tobias works for <a href="http://www.git-tower.com" rel="nofollow external" class="bo">Tower</a>, the Git client for Mac and authored the new (free) book <a href="http://www.git-tower.com/learn" rel="nofollow external" class="bo">Learn Version Control with Git - A step-by-step guide for the complete beginner</a>. Tobias is going to share a bit of information about a very uncomfortable moment when using Git: the merge conflict.</em></p>
    <p></p>
    <p>Everybody has a list of things they don't like: an appointment at the dentist, a traffic jam, or a canceled flight. When I was preparing <a href="http://www.git-tower.com/learn" rel="nofollow external" class="bo">my book</a>, I wasn't surprised that a lot of designers and developers would add merge conflicts to this list without hesitation.</p>
    <p>When using Git for version control, there is nothing to fear. Once you understand how merge conflicts work and how to deal with them, I'm sure you'll be able to cross them off this list.</p>
    <h3>You Cannot Break Things</h3>
    <p>The first thing that you should keep in mind is that you can always undo a merge and go back to the state before the conflict occurred. <strong>You're always able to undo and start fresh</strong>.</p>
    <p>If you're coming from another version control system (e.g. Subversion) you might be traumatized: conflicts in Subversion have the (rightful) reputation of being incredibly complex and nasty. One reason for this is that Git, simply stated, works completely different in this regard than Subversion. As a consequence, Git is able to take care of most things during a merge - leaving you with comparatively simple scenarios to solve.</p>
    <p>Also, a conflict will only ever handicap <em>yourself</em>. It will <em>not</em> bring your complete team to a halt or cripple your central repository. This is because, in Git, conflicts can only occur on a <em>your</em> local machine - and not on the server.</p>
    <h3>How a Merge Conflict Occurs</h3>
    <p>In Git, "merging" is the act of integrating another branch into your current working branch. You're taking changes from another context (that's what a branch effectively is: a context) and combine them with your current working files. Have a look at this <a href="http://www.git-tower.com/learn/ebook/command-line/branching-merging/branching-can-change-your-life" rel="nofollow external" class="bo">introduction to branching</a> if you're new to the concept in general.</p>
    <p>A great thing about having Git as your version control system is that it makes merging extremely easy: in most cases, Git will figure out how to integrate new changes.</p>
    <p>However, there's a handful of situations where you might have to step in and tell Git what to do. Most commonly, this is when there are changes to the same file on both branches. Even in this case, Git will most likely be able to figure it out on its own. But if two people changed the same lines in that same file, or if one person decided to delete it while the other person decided to modify it, Git simply cannot know what is correct. Git will then mark the file as having a conflict - which you'll have to solve before you can continue your work.</p>
    <h3>How to Solve a Merge Conflict</h3>
    <p>When faced with a merge conflict, the first step is to understand what happened. Did one of your colleagues edit the same file on the same lines as you? Did they delete a file that you modified? Did you both add a file with the same name?</p>
    <p>Git will tell you that you have "unmerged paths" (which is just another way of telling you that you have one or more conflicts) via "git status":</p>
    <img src="http://cdn.css-tricks.com/wp-content/uploads/2014/04/01-unmerged-paths-after-merge.gif" alt="" style="max-width: 100%; height: auto;">
    <h4>Conflict Markup</h4>
    <p>Let's take an in-depth look on how to solve the most common case: when two changes affected the same file on the same lines.</p>
    <p>Now is the time to have a look at the contents of the conflicted file. Literally open it in your code editor. Git is nice enough to mark the problematic area in the file by enclosing it in "<strong>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD</strong>" and "<strong>&gt;&gt;&gt;&gt;&gt;&gt;&gt; [other/branch/name]</strong>".</p>
    <img src="http://cdn.css-tricks.com/wp-content/uploads/2014/04/02-conflict-markers.png" alt="" style="max-width: 100%; height: auto;"><br>
    The code from your <strong>current branch</strong> is on top, the code from <strong>the branch you are merging in</strong> is on the bottom.<br>
    
    <p>The contents after the first marker originate from your current working branch. After the angle brackets, Git tells us where (from which branch) the changes came from. A line with "<strong>=======</strong>" separates the two conflicting changes.</p>
    <h4>Cleaning Up</h4>
    <p>Our job is now to clean up these lines: when we're done, the file should look exactly as we want it to look. It can be necessary to consult the teammate who wrote the conflicting changes to decide which code is finally correct. Maybe it's yours, maybe it's theirs, or maybe a mixture between the two.</p>
    <p>Opening the raw file in your editor and cleaning it up there is perfectly valid, but not very comfortable. Using a dedicated merge tool can make this job a great deal easier. You can configure your tool of choice using the "git config" command. Consult your tool's documentation for detailed instructions. Note that just because you have git installed doesn't mean you have a dedicated merge tool installed, these are separate, optional software tools.</p>
    <p>Then, in case of a conflict, you can later invoke it by simply typing "git mergetool".</p>
    <p>For this example, I've used <a href="http://www.kaleidoscopeapp.com/" rel="nofollow external" class="bo">Kaleidoscope</a> on Mac:</p>
    <img src="http://cdn.css-tricks.com/wp-content/uploads/2014/04/03-merge-conflict-in-gui.jpg" alt="" style="max-width: 100%; height: auto;">
    <p>The left and right panes stand for the conflicting changes; a far more elegant visualization than <strong>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</strong>" and "<strong>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</strong>".</p>
    <p>You can now simply toggle which change shall be taken. The middle pane shows the resulting code; in good tools, you can even edit this further.</p>
    <p>Now, after cleaning up the file with the final code, all that's left is to save it. To give Git a hint that you're done with this file, you should quit the merge tool to continue. Behind the scenes, this told Git to execute a "git add" command on the (now formerly) conflicted file. This marks the conflict as solved. Should you decide <strong>not</strong> to use a merge tool and instead clean up the file in your editor, you'll have to mark the file as resolved by hand (by executing "git add &lt;filename&gt;").</p>
    <p>Finally, after resolving all conflicts, a merge conflict situation needs to be concluded by a regular commit.</p>
    <h3>How to Undo a Merge</h3>
    <p>As already said, you can return to the state before you started the merge at any time. This should give you the confidence that you can't break anything. On the command line, a simple "git merge --abort" will do this for you.</p>
    <p>In case you've made a mistake while resolving a conflict and realize this only after completing the merge, you can still easily undo it: just roll back to the commit before the merge happened with "git reset --hard &lt;commit-hash&gt;" and start over again.</p>
    <h3>Tools Can Make Things Easier</h3>
    <p>I've already mentioned it briefly: being equipped with good tools can make your life quite a bit easier. <a href="http://www.git-tower.com/learn/ebook/command-line/tools-services/diff-merge-tools" rel="nofollow external" class="bo">A proper merge tool</a> will help you better understand a conflict scenario and make the right decision.</p>
    <h3>Have Confidence</h3>
    <p>With all the safety nets in place that Git provides, there's really no need to be afraid of merge conflicts in any way. Once understood how they work and what your options are, you should be ready to merge like there's no tomorrow. Always keep in mind: you can't break anything!</p>
    <h3>Note from the Editor</h3>
    <p>Tobias modestly left out Tower as an excellent tool to help with merge conflicts. In fact one of the reasons I personally use Tower is because I like how it helps with with merge conflicts. </p>
    <p>It's very clear when you have a conflict:</p>
    <img src="http://cdn.css-tricks.com/wp-content/uploads/2014/04/tower-conflict.jpg" alt="" style="max-width: 100%; height: auto;"><br>
    
    <p>And right-clicking on the conflicted file gives you some nice options:</p>
    <img src="http://cdn.css-tricks.com/wp-content/uploads/2014/04/theirs-yours.jpg" alt="" style="max-width: 100%; height: auto;">
    <p>So my process is usually:</p>
    <ol>
    <li>Is it very obvious to me whether my changes to this file or the other branches changes to this file should "win"? If so, select the relevant "Resolve &lt;file&gt; Using Mine" or "Resolve &lt;file&gt; Using Theirs"</li>
    <li>If I need a closer look, pop it open in a code editor and check it out. Then maybe still I can use one of those options.</li>
    <li>If it's more complicated, manually fix it up and then choose "Mark &lt;file&gt; as Manually Resolved" from Tower.</li>
    <li>Sometimes use a Merge Tool if there is a lot of complex fixes, which Tower also supports opening conflicts in via the "Open &lt;file&gt; in Merge Tool" option.</li>
    </ol>
    <hr>
    <p><small><a href="http://css-tricks.com/deal-merge-conflicts-git/" rel="nofollow external" class="bo">How to Deal with Merge Conflicts in Git</a> is a post from <a href="http://css-tricks.com" rel="nofollow external" class="bo">CSS-Tricks</a></small></p>
    </div>
]]>
</Body>
<Summary>The following is a guest post by by Tobias Günther. Tobias works for Tower, the Git client for Mac and authored the new (free) book Learn Version Control with Git - A step-by-step guide for the...</Summary>
<Website>http://css-tricks.com/deal-merge-conflicts-git/</Website>
<TrackingUrl>https://my3.my.umbc.edu/api/v0/pixel/news/43655/guest@my.umbc.edu/c206105ed1e2f794d4db4a250b7ee60a/api/pixel</TrackingUrl>
<Tag>article</Tag>
<Tag>css</Tag>
<Tag>html</Tag>
<Tag>javascript</Tag>
<Tag>mysql</Tag>
<Tag>php</Tag>
<Tag>sql</Tag>
<Tag>tricks</Tag>
<Group token="retired-583">Web Developer - Build Group</Group>
<GroupUrl>https://my3.my.umbc.edu/groups/retired-583</GroupUrl>
<AvatarUrl>https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/xsmall.png?1363101197</AvatarUrl>
<AvatarUrl size="original">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/original.jpg?1363101197</AvatarUrl>
<AvatarUrl size="xxlarge">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/xxlarge.png?1363101197</AvatarUrl>
<AvatarUrl size="xlarge">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/xlarge.png?1363101197</AvatarUrl>
<AvatarUrl size="large">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/large.png?1363101197</AvatarUrl>
<AvatarUrl size="medium">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/medium.png?1363101197</AvatarUrl>
<AvatarUrl size="small">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/small.png?1363101197</AvatarUrl>
<AvatarUrl size="xsmall">https://assets3-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/xsmall.png?1363101197</AvatarUrl>
<AvatarUrl size="xxsmall">https://assets4-my.umbc.edu/system/shared/avatars/groups/000/000/583/fc60f5d7abc2e080599bb6dc465db54d/xxsmall.png?1363101197</AvatarUrl>
<Sponsor>Web Developer - Build Group</Sponsor>
<PawCount>0</PawCount>
<CommentCount>0</CommentCount>
<CommentsAllowed>true</CommentsAllowed>
<PostedAt>Wed, 16 Apr 2014 08:00:23 -0400</PostedAt>
<EditAt>Wed, 16 Apr 2014 08:00:23 -0400</EditAt>
</NewsItem>

</News>
