modern project management - iowa state universityseniord.ee.iastate.edu/resources/project...
TRANSCRIPT
![Page 1: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/1.jpg)
Modern Project Management
Brendan BartelsB.S. Electrical Engineering
B.S. Biochemistry
![Page 2: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/2.jpg)
![Page 3: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/3.jpg)
![Page 4: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/4.jpg)
Accessibility into the past
![Page 5: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/5.jpg)
The past is the key to your success as an
engineer
![Page 6: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/6.jpg)
![Page 7: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/7.jpg)
You will become an expert
![Page 8: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/8.jpg)
“Tell me about a time when you enabled yourself to remember
something after you had forgotten it.”
![Page 9: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/9.jpg)
“Tell me about a time when you enabled your team to learn something
that you know in your absence.”
![Page 10: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/10.jpg)
¯\_(ツ)_/¯
![Page 11: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/11.jpg)
Archaic Project Management
Brendan BartelsB.S. Electrical Engineering
B.S. Biochemistry
![Page 12: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/12.jpg)
Archaic Project Management
Brendan BartelsB.S. Electrical Engineering
B.S. Biochemistry
Modern
![Page 13: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/13.jpg)
You Need To Manage• Tasks
• Communication Channels
• Files
![Page 14: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/14.jpg)
You Need To Manage• Tasks
• Communication Channels
• Files
![Page 15: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/15.jpg)
You Need To Manage• Tasks
• Communication Channels
• Files
![Page 16: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/16.jpg)
• Tool that allows you to track file changes over time
• https://git-scm.com/
What is Git?
![Page 17: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/17.jpg)
• A web application that allows you to• organize tasks• track work• document changes• integrate with Git
• This is the primary tool that will give you accessibility into your project
• https://about.gitlab.com/
What is Gitlab?
![Page 18: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/18.jpg)
How To Manage• Tasks
• Communication Channels
• Files
![Page 19: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/19.jpg)
How To Manage• Tasks
• Communication Channels
• Files
![Page 20: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/20.jpg)
Managing Tasks• Why do we care?
• We have to complete the tasks of the project to succeed… obviously…
• The entire team will not equally understand the tasks that need to be done.
• Can lead to sudden disagreements
• Can lead to people being left on the fringes
![Page 21: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/21.jpg)
Managing Tasks• How do we manage tasks?
• Determine the tasks
• This is typically the responsibility of leadership
• Rely on the expertise throughout your team
• Write the tasks down in detail
• Make the tasks accessible to everyone on the team
• This is also the responsibility of leadership
![Page 22: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/22.jpg)
Managing Tasks• What tools should we use?
• Trello is good, but…
• Use Gitlab Issues
• Gitlab Issue = Task
• Has a Trello-like board UI to help visualize tasks
![Page 23: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/23.jpg)
![Page 24: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/24.jpg)
![Page 25: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/25.jpg)
![Page 26: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/26.jpg)
Managing Tasks• Examples:
• https://git.ece.iastate.edu/danc/MicroCART/boards?=
• https://git.ece.iastate.edu/danc/MicroCART/issues/1
![Page 27: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/27.jpg)
Managing Tasks FAQ
• How do I add pictures/code/links to my Gitlab Issues?• All Gitlab posts support Markdown • (https://docs.gitlab.com/ee/user/markdown.html)
**bold**_italic_# Heading 1## Heading 2[link](http://example.com)(For pictures, just copy and paste into the draft)> Blockquote- List- List1. One2. Two`Inline code` with backticks
![Page 28: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/28.jpg)
How To Manage• Tasks
• Communication Channels
• Files
![Page 29: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/29.jpg)
How To Manage• Tasks
• Communication Channels
• Files
![Page 30: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/30.jpg)
Managing Communication Channels
• Why do we care?
• Communication between people is difficult.
• People forget things.
• Not all communication tools are equal.
• We want the best tools to ensure information is most accessible between team members.
![Page 31: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/31.jpg)
Managing Communication Channels
• What communication channels should we use?
• When you aren’t talking about project tasks, use something that prioritizes speed
• Slack is a good choice
• When you are talking about project tasks, use something prioritizes accessibility
• Slack is not a good choice
![Page 32: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/32.jpg)
Managing Communication Channels
The event horizon of the Slack black hole…
![Page 33: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/33.jpg)
Managing Communication Channels
• Use Gitlab issues when talking about project tasks:
• Post questions on relevant Issue threads
• Post updates on relevant Issue threads
• You can notify any team members with their @netid to get them involved in a conversation
• Sends them an email
![Page 34: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/34.jpg)
Use team members’ username and they will get an email
notification
![Page 35: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/35.jpg)
• Okay… okay…
• Slack is easier to use than discussion boards for technical conversations that need to happen quickly
• Just copy and paste the discussion into a relevant Issue thread when the conversation is finished
Managing Communication Channels
![Page 36: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/36.jpg)
This text was copied from a
Slack conversation
![Page 37: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/37.jpg)
• A word of caution
• Don’t overuse private communication channels
Managing Communication Channels
![Page 38: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/38.jpg)
How To Manage• Tasks
• Communication Channels
• Files
![Page 39: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/39.jpg)
How To Manage• Tasks
• Communication Channels
• Files
![Page 40: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/40.jpg)
Managing Files• Why do we care?
• People need to work on the same files, so we need a strategy to coordinate distributed changes
• People need to be able to find files, so we need as few locations to store files as possible
![Page 41: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/41.jpg)
Managing Files• How should we manage files?
• For things that require real-time collaboration
• Use Google Docs or Cybox + Office 365
• Otherwise…
• Use Git + Branch-Review-Merge workflow
![Page 42: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/42.jpg)
Managing Files• Using Git
• Using a Branch-Review-Merge workflow
![Page 43: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/43.jpg)
Managing Files• Using Git
• Using a Branch-Review-Merge workflow
![Page 44: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/44.jpg)
• Git is a timeline of snapshots
• snapshots = commits
• timeline = branch
Intro to Git
Initial commit
Add README
Implement framework for…
https://git.ece.iastate.edu/danc/MicroCART/blob/master/documentation/how_to_use_git.md#how-do-i-make-changes
![Page 45: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/45.jpg)
To start tracking a project with git, enter the directory and use the “git init” command
![Page 46: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/46.jpg)
Hint: Use “git status” to get a hint about what you should do
![Page 47: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/47.jpg)
![Page 48: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/48.jpg)
[85762b0] Initial commit
master
![Page 49: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/49.jpg)
[85762b0] Initial commit
master
![Page 50: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/50.jpg)
[85762b0] Initial commit
master
![Page 51: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/51.jpg)
[85762b0] Initial commit
master
![Page 52: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/52.jpg)
master
[85762b0] Initial commit
![Page 53: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/53.jpg)
master
[85762b0] Initial commit
[d0f2f54] Replace greeting with question
![Page 54: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/54.jpg)
[85762b0] Initial commit
[d0f2f54] Replace greeting with question
master
![Page 55: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/55.jpg)
master
[85762b0] Initial commit
[d0f2f54] Replace greeting with question
• Use “git help” to learn about commands and get help on those specific commands.
![Page 56: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/56.jpg)
master
Local Computer Remote Host
[85762b0]
[d0f2f54]
• Now we need to get your local changes to the central remote host for the team
![Page 57: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/57.jpg)
[85762b0]
[d0f2f54]
master
Local Computer Remote Host
[85762b0]
master
[d0f2f54]
![Page 58: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/58.jpg)
[85762b0]
[d0f2f54]
[bbf92ad]
[85762b0]
master
Local Computer Remote Host
master
[d0f2f54]
• Let’s say someone else added a commit to the remote host, such that your local copy is obsolete
![Page 59: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/59.jpg)
[85762b0] [85762b0]
[d0f2f54] [d0f2f54]
[bbf92ad] [bbf92ad]
Local Computer Remote Host
master master
![Page 60: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/60.jpg)
Intro to Git FAQ
• What should I put in my commit message?
• A commit message is typically composed of a header and (sometimes) a body. The header is typically 50 characters or less, and the body is a couple lines down having variable length.
• It’s typically advised to use an imperative tone in the header, such as “change this” or “add this” as opposed to “changed this” or “added this.”
• How often should I commit?
• Commit the smallest stable change
• Or prefix an unstable commit with “wip: ” (work in progress)
![Page 61: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/61.jpg)
Managing Files• Using Git
• Using a Branch-Review-Merge workflow
![Page 62: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/62.jpg)
Managing Files• Using Git
• Using a Branch-Review-Merge workflow
![Page 63: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/63.jpg)
Branch-Review-Merge Workflow
• Why do we need to do this?
• Traditional workflows involve everyone making changes to a central branch/trunk
• Not Great
• Changes are delicate because everyone is working on the stable branch
• Changes are often made without notice, which can lead to team member confusion
![Page 64: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/64.jpg)
Branch-Review-Merge Workflow
• Big Idea:
1. Create your own personal branch (copy of master)• This gives you a safe environment to make your
changes
2. When finished, create a merge request for your branch• This gives your teammates a chance to review your
code and offer feedback before changes become final
3. After approval, merge your changes into master• And then delete your personal branch
![Page 65: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/65.jpg)
[85762b0]
[d0f2f54]
[bbf92ad]
master
Local Computer
[85762b0]
[d0f2f54]
[bbf92ad]
improve-comments
• Create a new branch that is a copy of master
![Page 66: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/66.jpg)
[85762b0]
[d0f2f54]
[bbf92ad]
master
Local Computer
[85762b0]
[d0f2f54]
[bbf92ad]
improve-comments
[8e656ec]
![Page 67: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/67.jpg)
[85762b0]
[d0f2f54]
[bbf92ad]
master
Local Computer
[85762b0]
[d0f2f54]
[bbf92ad]
improve-comments
[85762b0]
[d0f2f54]
[bbf92ad]
master
Remote Host
[8e656ec]
• Recall the state of our remote host
![Page 68: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/68.jpg)
[85762b0]
[d0f2f54]
[bbf92ad]
master
Local Computer
[85762b0]
[d0f2f54]
[bbf92ad]
improve-comments
[85762b0]
[d0f2f54]
[bbf92ad]
master
Remote Host
[85762b0]
[d0f2f54]
[bbf92ad]
improve-comments
[8e656ec] [8e656ec]
![Page 69: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/69.jpg)
Branch-Review-Merge Workflow
• Now that we have your branch on the remote host, open a Merge Request for your branch to be merged into master
![Page 70: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/70.jpg)
Notify team members that you want to review your changes in the description of your merge
request, so that they get an email
![Page 71: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/71.jpg)
![Page 72: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/72.jpg)
Branch-Review-Merge Workflow
Branch-Review-Merge Workflow
• Use the inline code comments to give specific feedback on changes
![Page 73: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/73.jpg)
Branch-Review-Merge Workflow
Branch-Review-Merge Workflow
• When your teammates have reviewed and approved your code, merge it!
[85762b0]
[d0f2f54]
[bbf92ad]
master
Local Computer
[85762b0]
[d0f2f54]
[bbf92ad]
improve-comments
[85762b0]
[d0f2f54]
[bbf92ad]
master
Remote Host
[85762b0]
[d0f2f54]
[bbf92ad]
improve-comments
[8e656ec] [8e656ec]
![Page 74: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/74.jpg)
Branch-Review-Merge Workflow
Branch-Review-Merge Workflow
• When your teammates have reviewed and approved your code, merge it!
[85762b0]
[d0f2f54]
[bbf92ad]
master
Local Computer
[85762b0]
[d0f2f54]
[bbf92ad]
improve-comments
[85762b0]
[d0f2f54]
[bbf92ad]
master
Remote Host
[85762b0]
[d0f2f54]
[bbf92ad]
improve-comments
[8e656ec] [8e656ec] [8e656ec]
[f17ce0c]
![Page 75: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/75.jpg)
Branch-Review-Merge Workflow
Branch-Review-Merge Workflow
• When your teammates have reviewed and approved your code, merge it!
[85762b0]
[d0f2f54]
[bbf92ad]
master
Local Computer
[85762b0]
[d0f2f54]
[bbf92ad]
improve-comments
[85762b0]
[d0f2f54]
[bbf92ad]
master
Remote Host
[8e656ec] [8e656ec]
[f17ce0c]
![Page 76: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/76.jpg)
[85762b0]
[d0f2f54]
[bbf92ad]
master
Local Computer
[85762b0]
[d0f2f54]
[bbf92ad]
improve-comments
[85762b0]
[d0f2f54]
[bbf92ad]
master
Remote Host
[8e656ec] [8e656ec]
[f17ce0c]
[8e656ec]
[f17ce0c]
![Page 77: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/77.jpg)
[85762b0]
[d0f2f54]
[bbf92ad]
master
Local Computer
[85762b0]
[d0f2f54]
[bbf92ad]
master
Remote Host
[8e656ec]
[f17ce0c]
[8e656ec]
[f17ce0c]
![Page 78: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/78.jpg)
[85762b0]
[d0f2f54]
[bbf92ad]
master
Local Computer
[85762b0]
[d0f2f54]
[bbf92ad]
master
Remote Host
[8e656ec]
[f17ce0c]
[8e656ec]
[f17ce0c]
![Page 79: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/79.jpg)
Branch-Review-Merge Workflow
• Other Examples:
• https://git.ece.iastate.edu/danc/MicroCART/merge_requests/11
![Page 80: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/80.jpg)
• What about merge conflicts?
Branch-Review-Merge Workflow
[f17ce0c]
master
Local Computer
[f17ce0c]
[0d46dbf]
master
Remote Host
[f17ce0c]
[e98ad66]
hello-earth
[f17ce0c]
[e98ad66]
hello-earth
![Page 81: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/81.jpg)
[f17ce0c]
master
Local Computer
[f17ce0c]
[0d46dbf]
master
Remote Host
[f17ce0c]
[e98ad66]
hello-earth
[f17ce0c]
[e98ad66]
hello-earth
[0d46dbf]
![Page 82: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/82.jpg)
[f17ce0c]
master
Local Computer
[f17ce0c]
[0d46dbf]
master
Remote Host
[f17ce0c]
[e98ad66]
hello-earth
[f17ce0c]
[e98ad66]
hello-earth
[0d46dbf]
![Page 83: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/83.jpg)
[f17ce0c]
master
Local Computer
[f17ce0c]
[0d46dbf]
master
Remote Host
[f17ce0c]
[e98ad66]
hello-earth
[f17ce0c]
[e98ad66]
hello-earth
[0d46dbf]
![Page 84: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/84.jpg)
[f17ce0c]
master
Local Computer
[f17ce0c]
[0d46dbf]
master
Remote Host
[f17ce0c]
[e98ad66]
hello-earth
[f17ce0c]
[e98ad66]
hello-earth
[0d46dbf]
![Page 85: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/85.jpg)
[f17ce0c]
master
Local Computer
[f17ce0c]
[0d46dbf]
master
Remote Host
[f17ce0c]
[e98ad66]
hello-earth
[f17ce0c]
[e98ad66]
hello-earth
[0d46dbf]
![Page 86: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/86.jpg)
[f17ce0c]
master
Local Computer
[f17ce0c]
[0d46dbf]
master
Remote Host
[f17ce0c]
[0d46dbf]
hello-earth
[f17ce0c]
[e98ad66]
hello-earth
[e98ad66]
• Git will likely open a text-editor (vim) for the commit• Use “:q” to just quit and use the commit message as is
[1e52485]
![Page 87: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/87.jpg)
[f17ce0c]
master
Local Computer
[f17ce0c]
[0d46dbf]
master
Remote Host
[f17ce0c]
[0d46dbf]
hello-earth
[f17ce0c]
[0d46dbf]
hello-earth
[e98ad66]
[1e52485]
[e98ad66]
[1e52485]
![Page 88: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/88.jpg)
[f17ce0c]
master
Local Computer
[f17ce0c]
[0d46dbf]
master
Remote Host
[f17ce0c]
[0d46dbf]
hello-earth
[f17ce0c]
[0d46dbf]
hello-earth
[e98ad66]
[1e52485]
[e98ad66]
[1e52485]
![Page 89: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/89.jpg)
[f17ce0c]
master
Local Computer
[f17ce0c]
[0d46dbf]
master
Remote Host
[f17ce0c]
[0d46dbf]
hello-earth
[f17ce0c]
[0d46dbf]
hello-earth
[e98ad66]
[1e52485]
[e98ad66]
[1e52485]
[e98ad66]
[1e52485]
[3a24661]
![Page 90: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/90.jpg)
[f17ce0c]
master
Local Computer
[f17ce0c]
[0d46dbf]
master
Remote Host
[f17ce0c]
[0d46dbf]
hello-earth
[e98ad66]
[1e52485]
[e98ad66]
[1e52485]
[3a24661]
![Page 91: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/91.jpg)
[f17ce0c]
master
Local Computer
[f17ce0c]
[0d46dbf]
master
Remote Host
[f17ce0c]
[0d46dbf]
hello-earth
[e98ad66]
[1e52485]
[e98ad66]
[1e52485]
[0d46dbf]
[e98ad66]
[1e52485]
[3a24661] [3a24661]
![Page 92: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/92.jpg)
[f17ce0c]
master
Local Computer
[f17ce0c]
[0d46dbf]
master
Remote Host
[e98ad66]
[1e52485]
[0d46dbf]
[e98ad66]
[1e52485]
[3a24661] [3a24661]
![Page 93: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/93.jpg)
[f17ce0c]
master
Local Computer
[f17ce0c]
[0d46dbf]
master
Remote Host
[e98ad66]
[1e52485]
[0d46dbf]
[e98ad66]
[1e52485]
[3a24661] [3a24661]
![Page 94: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/94.jpg)
• What about files generated by software? (not directly written by you)
• Can still use Git, but keep in mind the diffs will be unmanageable, don’t bother examining them
• Resolve merge conflicts with “git checkout —ours” or “git checkout —theirs”• (This essentially ignores all of one team member’s
changes, so it is best to avoid this scenario. Coordinate with your teammates so that only one person is ever working on binary files at a time.)
Branch-Review-Merge Workflow FAQ
![Page 95: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/95.jpg)
Managing Files• Web Pages
• For tutorials, how-to’s, or orientational documents, write these documents as Markdown files, and then Gitlab will render these as web pages for you
• Gitlab’s Markdown Reference:• https://docs.gitlab.com/ee/user/markdown.html
![Page 96: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/96.jpg)
![Page 97: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/97.jpg)
Review How to Manage• Tasks• Define and track tasks with Gitlab Issues
• Communication Channels• Use Gitlab issue threads whenever you are talking
about tasks
• Files• Use Git and Gitlab Merge Requests• Use Markdown to turn files into web pages on Gitlab
![Page 98: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/98.jpg)
Questions?
![Page 99: Modern Project Management - Iowa State Universityseniord.ee.iastate.edu/resources/Project Management.pdf · Branch-Review-Merge Workflow • Big Idea: 1. Create your own personal](https://reader034.vdocuments.site/reader034/viewer/2022042110/5e8ab00fcf8d1d3aaa435a3a/html5/thumbnails/99.jpg)
Activity