• BMCC OpenLab
    • Home
    • Members
    • Courses
    • Portfolios
    • Communities
    • Projects
    • About
    • Calendar
    • Help
  • My OpenLab
    • Home
    • Members
    • Courses
    • Portfolios
    • Communities
    • Projects
    • About
    • Calendar
    • Help
  • Sign Up
  • Log In
Skip to content
MMP 350 Advanced Web Design

MMP 350 Advanced Web Design

  • [ Course Profile ]
  • Weeks
    • Class Recordings
    • Week 1: 8/25
    • Week 2: 8/30 + 9/1
    • Week 3: 9/13
    • Week 4: 9/20 + 9/22
    • Week 5: 9/27 + 9/29
    • Week 6: 10/4 + 10/6
    • Week 7: 10/13
    • Week 8: 10/18 + 10/20
    • Week 9: 10/25 + 10/27
    • Week 10: 11/1 + 11/3
    • Week 11: 11/8 + 11/10
    • Week 12: 11/15 + 11/17
    • Week 13: 11/22 + 11/24
    • Week 14: 11/29 + 12/1
    • Week 15: 12/6 + 12/8
    • Week 16: 12/13
  • Topics
    • CSS
    • HTML
    • Design
    • Eleventy
    • JavaScript
    • Tools
    • Miro Boards
  • Projects
    • All Assigned Work
    • Portfolio Brief
    • Responsive Site Project
    • Eleventy Site Project
    • Final Group Project
      • Final Project Brief
  • About
    • Getting Started (Class)
      • Accounts
      • Dev Environment Setup
    • Class Communication
    • Class Directory
      • Prof Stein
    • Syllabus

Tag: merge conflict

Git Merge Conflicts

When you’re doing a Git Merge, sometimes you have made changes to the same line of code that someone else also changed. When you try to merge your files you will get an error message that will look something like this: When this happens, Git will create a special version of the files that had… Continue reading Git Merge Conflicts

Published December 17, 2021
Categorized as Final, Personal Project, Tools, Tools Tagged git, merge, merge conflict

Authors

  • [ Course Profile ]
  • Weeks
  • Topics
  • Projects
  • About
MMP 350 Advanced Web Design
Proudly powered by WordPress.

Welcome to the BMCC OpenLab!

 

BMCC’s OpenLab is an online platform where the College’s students, faculty and staff can come together to learn, work, play and share ideas.

Support

Help | Contact Us | Terms of Use | Privacy Policy |  Credits Please use the above links if you need more help in using the OpenLab.

Powered by:

CBOX-OL Logo

top

Welcome to the BMCC OpenLab!

 

BMCC’s OpenLab is an online platform where the College’s students, faculty and staff can come together to learn, work, play and share ideas.

Support

Help | Contact Us | Terms of Use | Privacy Policy |  Credits Please use the above links if you need more help in using the OpenLab.

Powered by:

CBOX-OL Logo

top